[pull] master from NixOS:master #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Fix copy pasta from the vlan service: Vlan -> MACVLAN
VLAN is an abbreviation, so let's not write Vlan.
Probably a missed left over from somewhere in the commit 58f385f. As can be seen in that commit where this line was introduced, "$@" was also just emptied by the last `set` call in line 169. This line is currently valid, but breaks suddenly when somewhere earlier a `set --` instruction is used in the future. Neither in commit 58f385f nor in PR #197547 have I found anything stating that this "defect" was intentional.
…nixfmt-rfc-style (#346521)
* i3-back: init at 0.3.2 Add i3-back, a i3/Sway utility to go back to the last focused window. Link: https://github.com/Cretezy/i3-back * Update pkgs/by-name/i3/i3-back/package.nix --------- Co-authored-by: Sandro <[email protected]>
Should fix source builds by relying on our beloved archive.org to host a [SHA256-matching tarball generated from a mirror of the repo](https://archive.org/details/ryujinx-5dbba-07e-33e-83c-9047dcbb-701c-9655edbbe-89086.tar). I have only `nix repl`'d the fetchTarball expression for its consistency check, as I do not currently have the time nor storage to build the package locally, sorry about that. We could also generate archives to address #345410 and the 24.05 branch. Supersedes: #345881
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )